CHANGE - continued work on #25 also correct typo