Some cleanup-work on shell, color, etc.
Merging