Fixed some stuff that was broken due to.........

formatting changes again? wtf