pull in charlies latest (last?) edits to house extra fields, closes #144