Fix warnings and finalize the storyline