style changes, plus partial fix for really lnog lines