made help more explicit
entry test is done
entry test done find started
fixed merge conflicts
Merge branch 'testing'