more bug fixes

fixed!