Removed Port field from Service struct, added empty map aerror.

Not much point having Port as a field when it's already the map key :)
add tests