Fixed some stuff broken. Whoops