Adam's big update and some style tweaks.