various random changes

various random changes