last check before major test, added comments and squashed two bugs