made a few more changes