a few small changes to clean up.