Load ruleset bug fix and cosmetic changes