Fix offline behaviour and make it fit in 80 cols