End of day 6/5/13

Various edits