Worked through the build again, some tweaks.