[] - some fixes