Updated and cleaned some things