build better demo found some bugs + fixes