Various minor enhancements.
Various whitespaces, hacks, ... Sync.