Adding Vermont; fixing some nasty glitches