merged ivanich's camera fixes