Cleanup; adding addr message receiving