fix comments
insist on int constants to make error detection and reporting better