Added extra descriptive comments to some classes