New weekly rendering, major cleanup