Some performance improvements .. but very long lines don't look so nice now