bug fixes and shit