some simple form changes;
merge