Found some spare time tonight and landed some outstanding camino patches tonight, some UI tweaks, a crash fix on window close, and updating cookie prefs from recent mozilla changes.