Added tests. Typo fixes. Comment adds/fixes.