sanity commit

Nothing major. Small changes to test FormFactory.