fix some bug as, once again. i can't figure out how to use Git Stash without fucking something up