!B some fixes