Added unsubscribe function
Fixes for IP address