preparing for 'final refactoring' towards official release number 1