Various cosmetic changes and small improvements to illustrate OSGI behaviour