Repairing some stuff; fixing TODOs