implemented konverg + some cleanup