% some fixes;