Cms Class Update

- Bugfixes
* Minor improvements

See Wiki for Documentation - http://github.com/fschuetz04/2gp/wiki/Cms-Class-Documentation