Tweaks and fixes, switch instances of 'form_id' to just 'form'