chore: some small updates

[edgesoft]

@christianalfoni This was fine 4 days ago but now seems to have some conflict. Would you like to resolve it or should I try? Not a friend of git though :)

[christianalfoni]

This are my notes on updating fork

• git fetch upstream (upstream points to this repo, origin should point to your fork on github)
• git checkout master
• git pull upstream master (this should pass with no conflicts at all, should be a simple fast forward)
• git push origin master (not important, but anyway...)
• git checkout your-pr-branch
• git rebase master (does the trick)
• If things break during the rebase, you should fix the conflicts, then git add, then git rebase --continue
• When the rebase is done, git push origin your-pr-branch