Added stories truncation
Fixed some bugs