A few small refactors and fixes, moved things over to first episode.