performance & PHPDoc improvements
Dramatically reduce the amount of queries to DB