Issue #90 corrections per Aidins comments