369.23 Exposed qf and added some more input validation