updates to form tool and tracking fixes