and more small changes