server changes for 0.02 beta