Update with several minor improvements regarding ease of use, security and stability.

Update with several minor improvements regarding ease of use, security and stability.

Fixed problem with setting when something is "nearby"