small updates merged from lab computer