Minor tweeks

Added some code, tested with 6 clients needs further testing