some tweaks to form