Fixet minor issues with refrence and namespaces...