updated operators to work a little better