Bug fixes and Enderball