Add documentation
Minor edit in comments, add access modifier to some properties