Speed improvements, adjustments, corrections