Unified description tag and fixed some bugs