#27: some improvements