Other minor changes

Trying to not change behavior of you code...