Redoing wordlets and adding a q&d demo