Various simplifications/Cleanups

Been sitting on these for a while. Just a few minor cleanups/bugfixes.