Story 0

Fixes