Removing references to fpMap from fpSocket
Improving behaviour of popups
Fixing labels in Firefox