clearer variable names, fixes