Fixed changes - catches invalid commands more easily.