some bugg fixxes