ENH: some improvements after a practice run