resetted cipher to normal state, fixed score bug
merge