Renamed command scripts to be less ambiguous
Various improvements