a few random changes