fixed a gnarly reset bug
cleaned out old comments