Some new utilities and tweaks. 0.9.7