support for location awareness and a few small functionality improvements.