Some changes
Bunch of random updates