Docblock updates and changes in code style for references to match merlin's ($a = &$b instead of $a =& $b)