resolve some language todos