Fixed command bugs and errors.
Fixed area overriding.