fixed errors + demo updated