some fixes, some runtimes
i makes it works?