fixes
merge
added stories