[#3022] Adding service container expression language details
[#3232][#3022] Making many small tweaks thanks to @WouterJ and @xabbuh