Develop

While working on a sample application, some more improvements were detected ...