Better Demo, small fixes