polishing, bugfixes