Update Exception msg
More type safety
Fix closeness calculation