various small changes including chorale/thingfinder support and attempt at
nuns support (not actually working yet)