Few operation bugs fixed