Fixes warnings, typos.
Typos, renames.