Added noise, fixed random stuff