massive commit. fixed a ton of variable names, added override and sideonly annotations where they should be