cleanup, make demo less dumb, generally happier code