fixed data and scripting issues on server and client