Some untested updates + documentation overhoal