General cleaning up and fixing of brokenness.