1.1 update for FMQL - comments, code neatening for TOX.