Cleaned up some array handling using thisArg where available
Client ids updated to allow remote connections