fixing copy/paste foolishness and another silly bug