Some testing and tweaks.