cleanup and fixing images