work here and there in all the labs. some touch ups after the last header change commit.