Story 1: Fix some bugs