more merges of compose.c, removal of fatal warnings, and some minor fixes.