changes to models/forms/templates from Jan 2-4, 13