more work on options, some class reorganization, a few new fiels in the invite sample;