Rename some vars
Touching up README