upd readme
remove useless checkings
more one fix
fix comment, restore original check
remove redaudent tokens
Merge branch 'chris' into config