Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
Similarly getting the point for the hotspot and getting the waypoint location might be functions that you could write and then call in multiple places. These seem like they might be especially useful one you've combined the control and other conditions together.