more story; small fixes