Various tweaks
Added demo