Location contents fixes.
Refactor commands, add helptext.