Fix arrow
Remove commented stuff
Use fixed width body
Tweaks