Attempt to improve Location accuracy, closes #24