sevveral random changes