Code Restructuring
 fixed missing } in image ctor, misc changes