More clean-up, added some Final pictures.