Fixed some bugs;
Design improvement;