Fixed brokenness, discovered more brokenness.