Updates from jason

There's quite a bit in here, but it should render correctly, at least it does on Chrome and firefox. I don't quite have things setup to properly test on IE locally, if you'd like to stage it I'll take a look.