Minor cleanout and changes, as well as minor bug-fixes. This is apart of cleaning out the CMS and reinstalling it from new.