more camera fixes. Probably fine now...