Improve parsing, add font-size and tests, refactor