misc fixes

helping things now that they're going faster