fixed xstream issues, started updating jelly file