General changes I made

A couple changes