added analytics and fixed paths