add using. fix bugs.