camera fix, housekeeping