more bug fixes

:D