Fixed some bugs in episode-3