minor changes I had lying around