Some extra documentation and tweaks.