a few more small changes