Better docs and probably other shenanigans