Add description and some fix