(freestyle) updates by Kirsten Häusler and better table linebreaks