Small fix
Fix ARPEES
Fix bugs