Fixed 'auto br' line + minor performance improvements