minor improvements - need to leave the lab!