First pass of comments
Bug fixes with Adam on comments branch