General Improvements

See commits for details