some fixxes