Episode 5 and cleanups