#6 general cleanup and addition of pf rules