various small performance updates