More tweaks and general stability fixes.