Some unpushed commits

No push access to main repo, so sending via PR