Fixed several bugs, including subtraction always evaluating to 1, added more debug code
Added more debug, and neatened up code
Just A lot of bug fixing and testing