some minor fixxes.