Various Updates

Please see commits for details.