Added a little additional verification for the build spec, cleaned up a TODO item.