change codes & fix  errors