some cleansup & added some images