bugfixes & polishing