and some extconf re-arranging