minor refactorings plus updated todo list plus namespace refactorings