Re-added ls--, few other minor changes.