Some enhancements

Hi, 

Please, I have written some enhancements and fixes I need for shorewall 4.6, tell me if you are interested in,
if yes, I can provide different pull request to split this work.

Cheers,