Text2Image support + many minor improvements
requested review from @tomantta
merged
mentioned in commit f8c58d4f