fixed some isues