General improvements.

Build time now 13 minutes.