fixed more small issues