bug fixed and code improvment
City and flag improvment