More features, added localities