Fix some Bug and more improvment