Improvements and bugfixes.

And please replace " : " with ": " (no beginning space)!