TODO updates + documentation edits.