Made a few more changes...

These aren't as important to get merged fast, but you'll want em ;)

Thanks for this great start for my talk adam!