some issues fixed