Fix so dumb bugs all the way through.