Inbound support + a few cleanups

This PR adds inbound support for desktop firefox. There's also a few more minor cleanup commits.