more bug-fixes