Debugging some errors, marked todo