client and server js updates