More cleanup and php doc stuff.