Added story, fixed bugs