Better debug commands, + fixes