Tweaks and fixes
Typo
Fix field width