bug fixes
more bug fixes
blah