Added a few small changes.
Added a few small changes.