better line breaking
new timing
commented out hack for documentation