Tweaks to Thorsten's submissions.