Updated tags and edited typos