fix pretty; improve demo