last few tidy ups, add icons to things etc