Feature/fix cookie shit