update function declarations, add form helpers