Clean up spacing, add UPnP / DLNA / Multicast support to pf