label_t now a structure; other misc changes