Work through docs again, still stuff that is wrong / incomplete