more pics and cleanup