Improvements to episode generation, added catalog generation