Fixed some annoying bugs with the command handling