Switch zip code to zip4j, more robust. Couple fixes, mostly working