adjusting all features to allow cookies where needed and cleaning on spec merge junk