Fixes + new debug tools