Lots of miscellaneous. Some changes and form adds

Adjustments related to result of initial meeting.