Added more corrections

Fixed encoding, and added more corrections