addressing issues raised in #194

ready for review, ticks off a few of the issues in #194 - will keep working on these this week.