more form cleanup, plus table cleanup.