fixing even more stuff after rebasing GO HOME GIT YOU'RE DRUNK