Cleaning up with defaults, adding proposed, backports