Fix docblocks and minor refactoring of __get() method

Ah ok @ADmad , so i would better change it back to `object` then