Fixed up come comments and documentation;