Some phpdoc and metadata updates + some fixed typos