Various small additions and tweaks.