indent fixed and added some aliases