Finish comments, redo some others to increase usefulness