clarify some TODOs
small cleanup of built in types