Fix some perf/space problems, add a cover for e621