improve variable names, add a pending step for a bugfix