End of semester commit

Oh yeah, i just noticed there were some changes.