some small fixes & improved demo