fix xtables and remove some fluff