Updated and added some things