Added aliases and improved shell history handling