more small changes to how it works.