tweaks following feedback from @sospirited