some fixes all over