improvements toward 3.0.0 release