some restructuring, design improvements and work on multilanguage feature