General modifications.

I will need to create a custom commandMap soon, Bukkit is overriding Canary commands.