clean up
better collision and stuff...
Merge pull request #15 from c0smo/master

Na deaici!