Add pictures, cleanup comments