fix some bug
finish ch6-1
finish ch6-2
finish ch6