Updated to support most recent clanlib changes.
More work on Gwen support.