some fixes preview