small fixes to parser and lister