Add zip code field and fix some little problem