use A&D for P1 and J&L for P2
I mainly just took away bugs and glitches. All credit goes to @omarisderp
