more fix-ups, started to address #91