added some bugs last commit.