union - some fixes