A few tweaks, new functionality.