Revise naming of vars, revise readme