added F versions and CTL-c tidyup