More tweaks
Corrected typos