replace addy's logins with my own, fix st and d aliases.