Do not crash on every incorrect input, added synonyms for 'and' and 'or'...

..., some small fixes