mostly small changes