bugfixes & additions