Bunch of tweaks/modernizations; added object recognition

[ace-n]

It compiles, but the correctness of the output hasn't been verified (at all).