Some more polish and bugfixes.