Fixed stuff! GOD DAMNIT COMP!