Whoops. Fixed up some things