Updated and added some stuff