Fix issues found during final friend feature testing. Closes #28

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>