Section parsing and eval improved