add issues and some fix