Fixed some bugs??