commiting misc changes before additions
Edited Infinity member names for clarity