Start work on charybdis linking; general improvements.