Bug fixes and improved camera