some clean up, new demo