more bug-fixes :)