Added Ahri, some cleanup