Some CS changes and forgotten files