moved collision detection methods to AnalyticalGeometry, added fixes based on pull request comments