small improvements
Merge pull request #212 from creighton/improve

small improvements