more bug fixes
even more bug fixes