minor adjustments

Made some minor adjustments.  email me if anything seems broken.