Setup for Common Core Standards, and other changes