Add some story from python version, make a few fixes to engine