solved some TODOs (5 left), added more doc. pages