fixed TODO comments and regex comment