Fixed up docs and a few minor changes from raphink