wip @ snapshots + phpdoc fixes