More demo work, cleanup / refactor of various utile.