form tweaks
merging