Pull request for commits I forgot to PR

Over a week of commits!