A somewhat unfinished expansion and some minor changes