master: numerous changes