some fixups; started on demo plan