small fixes so it looks just like waf input