added analytics, fixed ff bug