Some fixes/enhancements/cleanup
Some fixes/enhancements/cleanup

phil-davis/pfsense,NewEraCracker/pfsense,ptorsten/pfsense,dennypage/pfsense,pfsense/pfsense,ptorsten/pfsense,dennypage/pfsense,ch1c4um/pfsense,ptorsten/pfsense,ch1c4um/pfsense,NOYB/pfsense,BlackstarGroup/pfsense,dennypage/pfsense,BlackstarGroup/pfsense,NewEraCracker/pfsense,brunostein/pfsense,ch1c4um/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,NOYB/pfsense,BlackstarGroup/pfsense,brunostein/pfsense,phil-davis/pfsense,dennypage/pfsense,brunostein/pfsense,phil-davis/pfsense,pfsense/pfsense,jxmx/pfsense,jxmx/pfsense,NewEraCracker/pfsense,ch1c4um/pfsense,jxmx/pfsense,BlackstarGroup/pfsense,pfsense/pfsense,pfsense/pfsense,NOYB/pfsense