FIX: string check in phpdoc
ADD: singleton stuff