some issues fixed
some commit