some fixes;