Fix bugs add more remote capability