made some more small changes