minor changes
Merge pull request #1 from alevy/tweaks

minor changes