some bugg fixxess