added 'and','or' op and fixed bug (parser error, cond expression, etc)