Fixed typos/ bugs / errors