uninitialized variable fix
demo tweaks