Several misc updates from Master