Add deflist tag, change a couple of things