Fixed and improved some ARO logic
1.0.3