- added missing nsmap
- added RunTimer functionality
added some missing files