MaxHS v2.5: Extensive code changes