updates to qf grammar