minor renames and additional comments