Tweaked some params. Removed some old commented dist calc code