More minor fixes, doc improvements, addition

good phpdoc format