fixed a few glitches with last commit