some cleanups
Merge branch 'master' of https://github.com/lionelgit/gsim