Added debug constant for easier... debugging...
Updated to b17 recovered code.