style + link
hacks and stuff - with/out fake time
Merge branch 'jon' into gh-pages