Added op assign operators, cleaned up a few things