new links
remove and combine
more condensed
final touches
timing
Merge pull request #222 from mwernimont/master

new links