Updated build and source
adding in image support and other