Add sample images
Fix CLI support, cleanup todos, better main comment