Story 2: Fix some bugs