Fixed typos and format and updated some labels