Added image
Bug fixes and clean up