Fixed some shit, hopefully