Various Fixes, Cleanup, and Additions

See commits for details