A few minor changes and small bug fixes.