Fixed problems with namespace and other things.