some image clean up, added map