fixed all bugs i doo