Stub out stories, some design tweaks