more bug fixes

this should work?