Updated and revised some things