Update TODO
Add image option to usage
Update TODO