some more random changes