fixed wrong image and cleanup