added zip code validation and fix issues