added debug options to cpp-defs; is this where they should go? ...-sai
fixed inheritance of stream to be public rather than private... -sai
added some variable to help with debugging off by one error... -sai