reorderd configs, added aliases