Fixed constants.h being out of sync

Also removed some debug printing.