(pre-release) func::diff & multiple fixes