Fix treatment of lines with string from/tos
Fix some alignment code