fixed a couple first-run bugs