Minor improvements

10/2/14 10PM