adding yeoman and better collision detection