UPDATE: Docs and minor optimisations