few more small changes