Fix bad alias and stomp WARNING
Updated TODOs