fixed some bugs yo