Improve cookies. Make headers more correct