some fixes ..