minor fixxes