Fixed and added some stuff.