Additional  cleanup, localization re-work, application module instance