Fixed avg calculation bugs, added fields for street segments