add new demo, small fixes