server side updates

Several updates to server side code