Adding remaining exts and removing TODO comments