Updated docs, names and demo