more minor fixes. how boring!