Reorganized shorewall, various fixes