minor updates. Sorry for the merge conflicts you are about to have