[WIP][FOLD] Small tweaks & commentary