TODOs resolved: documentation added