Typo
Add missing aborts
Header tweaks