keylines, other minor fixes