tidied up & generally improved references to F & Q