more work on client and startup procedures