added EDITOR and new aliases