Fixes, layout, typo