ssh config update for 6.5 and some tweaking