Updates to make nice packages
add a small stand-alone demo