Cleaned up code and minor enhancements, started Android maps changes