small changes, to merge from lab to laptop