Improve parsing for identifiers

Introduces better handling lines containing brackets and parenthesis.
Update status of manual tests