Made a couple subtle enhancements.