Bug fixes, and the new cookie editing function