more fixes
more cookie fun