fixed some issues in the remote class