some minor changes to client and temp