Probably stopping for lunch now, mostly style changes, added lots of comments