fixes #19 and perhaps others

will close before 10/11 PD.