Touch up for debug proc

This moves to a switch statement for debug proc since table didn't work out as the values aren't contiguous like I had originally thought. 

The other commits are faulty and negate each other.