Update comments, renamed some variables which shared names with reserved symbols.