Final changes/fixes