Clean up, added/repaired comments.