correcting to vanilla commands and Canary console command parsing, fixes #3