Bug fixes and ability to stop client and server tasks

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>
removed unnecessary method call

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>