I dunno, fixed some bugs