Reduced TODO
Minor fizes