#18 some minor changes.