updated after transition; minor patches