phpDoc fixes, last commit that resolves #2 and #3