Updated and adding some things