fix indent and add some aliases