fix #420 and others litte things.