fixed all bugs
xxx