So many uncommented improvements and fixes.