Rewrote Command Listener

Fixed potential bug in which all commands which started with the letter
"c" would trigger the internal listener.