Bug fixes, cam fix and other stuff