Small changes and fixes.