Fixes based on @kenchris's feedback

* various fixes suggest by @kenchris
* moved icon and name fallback behaviour out of processing section.