fixed some namespace references and strict error