smaller updates to defaults from Markus