Beef-XSS full addition with corrections