3rd commit

fix some bug...