Patched many broken things. See full commit report for more.