Switched to constants, debugging improvements