Several updates, many fixes/changes inspired by open PRs