Fixing some typos and inconsistencies