camera imgsensor fixed and some clean up