more tweaks to apply form