Still some room for improvement.

Going to additionally work on ILs since I happened to get started on some of them.