Tweak remote

A number of small improvements AND focus on rebase instead of merge
typo. Should be "Waisman"