add setting recommendded by lamont; add missing trailing commas