add take/drop to grammar, simplified grammar (merged non_identifier_chars and whitespaces again)
removed old todos, re-enabled and fixed all ignored test cases