some more small changes