Improved AoSP support + tracking jung man fights

Fixes #146