documentation comments, some methods renamed, check for defining page class more than once