Lab2

modifiy some bugs