Minor changes to commands and wip kick command

On hold until the command system is more fleshed out.