several fixes tested