fix comment style; redirect fix; delivery address state fix