Merge additional changes into master

Fixed 10 issues. Ready to deploy to departments.central.edu