few more clean ups
Merge pull request #15 from adrianob/fix_collision

few more clean ups