fixing included files, saving default address and making address field non-mandatory