impl: some improvements