no single line please.. (and a fix for home folder assumption