removed some todo + added documentation