bug fixes
more bug fixes