Looks about right at a glance. Let this be a lesson about doing the math for 30 builds in a single day: Triple-check your math! Will certainly be doing more of that in the future.
Good job with the spot-fixes, the reasoning for them is solid enough and you've saved me the time of doing them myself.