Improved the Camera further, added more Entity support