bug fixes and hotbar