partial commit, move fnc pos, minor fixes