Some organization and form changes