More appereance changes, fix some bugs.