- solved some TODO's