Misc Improvements

~~Including previous commits (other pull request(s)).~~