Fix more degrees and stuff