Various fixes and improvement of the existing applications.

Take care that maybe this should be __getSections