fixed long bar on odd lines and assorted cleanup