simplify versionning
cleanup up cookie code some