slaren:
	- fixed an assertion failure related to pets
	- made a few (mainly cosmetic) changes to the options
