moved timestamp generation to server, fixed small bug