Merge pull request #410 from katiewood/master

Change distance in warning messages
Merge pull request #411 from katiewood/master

remove unneeded htpline