V0.2.5a FirePro detection, other cleanup