Updated some bugs