Many improvements

rejects and accepts work in all cases
marks are concealed if possible.