Right - I had already pushed this; please fix. I fixed the other minor issues and will fix them on master when I merge your GFLR commit.