fixed some TODOs of missing code, now linked, all around the code