Pb/general improvements