added form, more tweaks