Added Auto Goal checkbox, fixed Float issue