Tidied up some stuff, extended zipcode support