Fixed typos + bugs