Renamed classes.
Added a new checkline
Adjusted ap recognition