Add debugging, fix defines for newest hardware version