Fixed things in Story