Small changes + analytics