improved parser spec