Adding full story and a lot of fixes