Changed some things, added some stuff.