Improve/sections lexing