some minor fixxes