Misc bugfixes, added cat and rescan editable commands