cleanup and img changes