benchmark, minor cleanup
Merge pull request #332 from linas/master

benchmark, minor cleanup