minor fixes, can demo perfectly now