ever forward...fixed a couple of bugs, removed debugging code