couple changes

A couple of changes to the code