[#32] Fixed typos and missing stuff based on PR comments.
[#32] Fixed typos and missing stuff based on PR comments.