Improved image cli option. Implemented image option in main.
Improved flavour option in cli and implemented in main.
Minor fixes.