Implemented some minor enhancesments. Verified as working for snort 2.9.4.1