some fixes it is better now