add namespace ,fixed lots things