added some fixxes