[MOD] clean up, comments, etc., all unit tests passed incl. XQUTS