More data structure tweaks
Fix major typo
Change output comment