Changed around some operators, and renamed some function arguments.