some namespace refectoring
Some bug fixes