added address indexing, fixes for -/ seperated words