Fixed some oversights, typos, docs