more small changes

I dont know why this wasn't in the first commit.