fix form free issue, etc