initial development branch changes from recent work