Final touch-ups for production build. (no release yet)