CMS Implemented, Minor Fixes