more housekeeping plus added the 2 camera libs I missed