more small issues