More bug fixes
Story restyling