Updated with abbreviated_streets and a couple other methods.