Here is some new patches with ngz's suggestions.