some bugs fixed, name feature added