bug fixes
fix collocation, and other things
Merge pull request #27 from clovis/master

merge from clovis