Added todo items
Fix uninstall try 3