-some bug fixes
-Location of ContactPoints now stored in database