some updates

Some changes on the Cookie part.