fixed a few things as a result of my last merge