bug fixes and more bugs