Final upload

Minor adjustments