Updated name space and corrected little errors