Typos and margin tweaks