Changed tooltip working

Moved TODOs into Github