Updated documentation/comments