many misc updates