small fixes and first demo