Small changes + piwik tracking code