First bunch of custom changes. Aliases and other minor stuff