Improved object location

* Improved code documentation
* WIP