lethal-check + some fixes