final updates to Cap files, other configs