some expedient files that were missing from a messy merge