Please merge doc

See !2 (closed), mainly some small documentation changes.