Add aliases file and few other tweaks