some final changes;