cleanup and more pics