Fixed width, added some extra gubbins