Missing includes added and typo corrections.