fixed a few annoyances after falling out of world