Added passenger aliases and better handling of dot-save.