lots of lab fixes...