commit all final fixes

just syncing with origin and upstream