did some cleanup, made sure working without photos