rm todo
exit if no type name
fix spillover
more locals